Add SBINDIR. Use it always.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index dd9e62c4646118e65ba5ae160d36790bee77f5ef..e0a29f7d0c0374c1d34ff09842d0d5f69875c92a 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -22,6 +22,7 @@ BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib64
+SBINDIR = $(PREFIX)/sbin
 
 SOCKET_LIBS =
 CURSES_LIBS = -lncurses

diff --git a/config/SunOS.mk b/config/SunOS.mk
index 7f11d4d9dc1c524dcbd8215705974479c3d8fd63..ffa0a778f7977f1e2683bcbbaa85fe44defce456 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -23,6 +23,7 @@ BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib/amd64
+SBINDIR = $(PREFIX)/sbin
 
 SunOS_LIBDIR = /usr/sfw/lib
 SunOS_LIBDIR_x86_64 = /usr/sfw/lib/amd64

diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index 8d2759fadc406dea29fff45a530efd31efbf44e3..d5c3f77e2d9806ebcd30b9b25667b7d3d44b6404 100644 (file)
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -5,7 +5,6 @@ INCLUDES += -I.. -I../lib
 
 IBIN         = blktapctrl tapdisk
 QCOW_UTIL    = img2qcow qcow2raw qcow-create
-INST_DIR     = /usr/sbin
 LIBAIO_DIR   = ../../libaio/src
 
 CFLAGS   += -Werror
@@ -53,7 +52,7 @@ img2qcow qcow2raw qcow-create: %: $(BLK-OBJS-y)
        $(CC) $(CFLAGS) -o $* $(BLK-OBJS-y) $*.c $(LDFLAGS) $(AIOLIBS) $(LIBS)
 
 install: all
-       $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
+       $(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(SBINDIR)
 
 clean:
        rm -rf *.o *~ $(DEPS) xen TAGS $(IBIN) $(LIB) $(QCOW_UTIL) $(VHD_UTIL)

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index 844295f398a30aed274fc84aec6565d4ba9f0c42..dee5b8112d2a1b6f5cae9272a935b92d8b595940 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -5,8 +5,6 @@ MAJOR    = 3.0
 MINOR    = 0
 SONAME   = libblktap.so.$(MAJOR)
 
-BLKTAP_INSTALL_DIR = /usr/sbin
-
 INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
 
 LIBS     := -lz

diff --git a/tools/console/Makefile b/tools/console/Makefile
index 22df98291532d8b77aa87d2044b0d8d18fd1625f..4ee3d0a816d755400b96aadb5cc0e65e9df8835d 100644 (file)
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -2,7 +2,6 @@
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-DAEMON_INSTALL_DIR = /usr/sbin
 CLIENT_INSTALL_DIR = $(LIBDIR)/xen/bin
 
 CFLAGS  += -Werror
@@ -30,7 +29,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
 
 .PHONY: install
 install: $(BIN)
-       $(INSTALL_DIR) $(DESTDIR)/$(DAEMON_INSTALL_DIR)
-       $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
+       $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
        $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)

diff --git a/tools/flask/loadpolicy/Makefile b/tools/flask/loadpolicy/Makefile
index 19e11dbd9b5b0e6aa487c905b144433eb25f3649..bb0ead6846e90525e854a52709f7a3edb4d908e5 100644 (file)
--- a/tools/flask/loadpolicy/Makefile
+++ b/tools/flask/loadpolicy/Makefile
@@ -51,8 +51,8 @@ print-end:
 
 .PHONY: install
 install: all
-       $(INSTALL_DIR) -p $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(SBINDIR)
 
 -include $(PROG_DEP)
 

diff --git a/tools/fs-back/Makefile b/tools/fs-back/Makefile
index 4f75f277a919197af88ac6e0b1b8113c061faf87..866defb7212a1d08ba1e167734d1989fff6ea657 100644 (file)
--- a/tools/fs-back/Makefile
+++ b/tools/fs-back/Makefile
@@ -4,7 +4,6 @@ include $(XEN_ROOT)/tools/Rules.mk
 INCLUDES += -I.. -I../lib
 
 IBIN         = fs-backend 
-INST_DIR     = /usr/sbin
 
 CFLAGS   += -Werror
 CFLAGS   += -Wno-unused
@@ -30,7 +29,7 @@ fs-backend: $(OBJS) fs-backend.c
        $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c
 
 install: all
-       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
+       $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
 
 clean:
        rm -rf *.o *~ $(DEPS) xen $(IBIN) $(LIB)

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index d4bde6be971b910bdf25d6fe53daa8ad08545c7f..62f2acf5f0fd486d4a311de41300e5aa40e3115c 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -30,9 +30,9 @@ build: $(TARGETS)
 .PHONY: install
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
-       $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
+       $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
 
 .PHONY: clean

diff --git a/tools/security/Makefile b/tools/security/Makefile
index 4ba944bb8bcc1be6a028560fb1306fe36f27a4b1..d33cf6fc55f2c4a756e77920e63f61e4a32690d8 100644 (file)
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -44,9 +44,9 @@ ifndef XEN_PYTHON_NATIVE_INSTALL
 install: LIBPATH=$(shell PYTHONPATH=../python/xen/util python -c "import auxbin; print auxbin.libpath()")
 endif
 install: all $(ACM_CONFIG_FILE)
-       $(INSTALL_DIR) $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(ACM_INST_TOOLS) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) $(ACM_EZPOLICY) $(DESTDIR)$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(ACM_CONFIG_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(ACM_POLICY_DIR)
        $(INSTALL_DATA) policies/$(ACM_SCHEMA) $(DESTDIR)$(ACM_POLICY_DIR)

diff --git a/tools/vnet/scripts/Makefile b/tools/vnet/scripts/Makefile
index 24f6f35880621b26e3796fdc21d48070010ea3de..22910a4432a13a3f3f323fa9e39a2e1fc967d850 100644 (file)
--- a/tools/vnet/scripts/Makefile
+++ b/tools/vnet/scripts/Makefile
@@ -3,15 +3,13 @@
 XEN_ROOT        = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-SBIN_DIR        = $(DESTDIR)/usr/sbin
-
 .PHONY: all
 all:
 
 .PHONY: install
 install:
-       $(INSTALL_DIR) $(SBIN_DIR)
-       $(INSTALL_PROG) vn $(SBIN_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) vn $(DESTDIR)$(SBINDIR)
 
 .PHONY: clean
 clean:

diff --git a/tools/vnet/vnetd/Makefile b/tools/vnet/vnetd/Makefile
index 8486c0d8f048913aec19fa7a06a995e2b9b810a3..b3e6b9f3de7f60c2543a4ce57abe37ecca16dfb0 100644 (file)
--- a/tools/vnet/vnetd/Makefile
+++ b/tools/vnet/vnetd/Makefile
@@ -29,8 +29,6 @@ all: vnetd
 
 INSTALL_PROG ?= $(INSTALL) -m0755 -p
 
-VNETD_INSTALL_DIR = /usr/sbin
-
 INCLUDES += -I$(LIBXUTIL_DIR)
 INCLUDES += -I$(VNET_MODULE_DIR)
 INCLUDES += -I$(shell pwd)
@@ -111,8 +109,8 @@ vnetd: $(VNETD_OBJ)
 
 .PHONY: install
 install: vnetd
-       mkdir -p $(DESTDIR)$(VNETD_INSTALL_DIR)
-       $(INSTALL_PROG) vnetd $(DESTDIR)$(VNETD_INSTALL_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) vnetd $(DESTDIR)$(SBINDIR)
 
 .PHONY: clean
 clean:

diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index c1f4cd3f4675a196b1fe4a5d8aebec506e944c9c..ef0b36227c54dc1f5549d82334b092e8d14bd305 100644 (file)
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -13,8 +13,6 @@
 XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-sbindir=/usr/sbin
-
 CFLAGS  += -Werror
 CFLAGS  += -I $(XEN_XC)
 CFLAGS  += -I $(XEN_LIBXC)
@@ -31,10 +29,10 @@ build: $(BIN)
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
-       $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
-       $(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(sbindir)/xentrace_setmask
-       $(INSTALL_PROG) xenmon.py  $(DESTDIR)$(sbindir)/xenmon.py
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked
+       $(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(SBINDIR)/xentrace_setmask
+       $(INSTALL_PROG) xenmon.py  $(DESTDIR)$(SBINDIR)/xenmon.py
 
 .PHONY: clean
 clean:

diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 1f8b2da380b170ea1b48f36e220452994129a718..479cee76e778202e0ade13e63f677aad22e5356f 100644 (file)
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -21,7 +21,6 @@ else
 prefix=/usr
 mandir=$(prefix)/share/man
 man1dir=$(mandir)/man1
-sbindir=$(prefix)/sbin
 
 CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
 LDFLAGS += -L$(XEN_LIBXENSTAT)
@@ -33,7 +32,8 @@ all: xentop
 
 .PHONY: install
 install: xentop xentop.1
-       $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+       $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop
        $(INSTALL_DIR) $(DESTDIR)$(man1dir)
        $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
 

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index ab8cd1e8fc55a70144ffb2bc54fef935ade6eb80..1fbd42ce12f4668f7a2a9b66cb28b457fffc314e 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -82,9 +82,9 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
        $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
        $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-       $(INSTALL_DIR) $(DESTDIR)/usr/sbin
+       $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
+       $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR)
        $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
        $(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)